Commit fb79bf12 authored by Cássio Gabriel's avatar Cássio Gabriel Committed by Takashi Iwai
Browse files

ALSA: sc6000: Keep the programmed board state in card-private data 



The driver may auto-select IRQ and DMA resources at probe time, but
sc6000_init_board() still derives the SC-6000 soft configuration from
the module parameter arrays.  When irq=auto or dma=auto is used, the
codec is created with the selected resources while the board is
programmed with the unresolved values.

Store the mapped ports and generated SC-6000 board configuration in
card-private data, build that configuration from the live probe
results instead of the raw module parameters, and keep the probe-time
board programming in a shared helper.

This fixes the resource-programming mismatch and leaves the driver
with a stable board-state block that can be reused by suspend/resume.

Fixes: c2828661 ("ALSA: sc6000: add support for SC-6600 and SC-7000")
Signed-off-by: default avatarCássio Gabriel <cassiogabrielcontato@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20260410-alsa-sc6000-pm-v1-1-4d9e95493d26@gmail.com
parent b9c82691

sound/isa/sc6000.c

+92 −60
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ MODULE_PARM_DESC(joystick, "Enable gameport."); 
#define PFX "sc6000: "

#define DRV_NAME "SC-6000"



struct snd_sc6000 {

	char __iomem *vport;

	char __iomem *vmss_port;

	u8 mss_config;

	u8 config;

	u8 hw_cfg[2];

	bool old_dsp;

};



/* hardware dependent functions */



/*
@@ -267,7 +276,7 @@ static int sc6000_dsp_reset(char __iomem *vport) 


/* detection and initialization */

static int sc6000_hw_cfg_write(struct device *devptr,

			       char __iomem *vport, const int *cfg)

			       char __iomem *vport, const u8 *cfg)

{

	if (sc6000_write(devptr, vport, COMMAND_6C) < 0) {

		dev_warn(devptr, "CMD 0x%x: failed!\n", COMMAND_6C);
@@ -353,8 +362,7 @@ static int sc6000_init_mss(struct device *devptr, 
	return 0;

}



static void sc6000_hw_cfg_encode(struct device *devptr,

				 char __iomem *vport, int *cfg,

static void sc6000_hw_cfg_encode(struct device *devptr, u8 *cfg,

				 long xport, long xmpu,

				 long xmss_port, int joystick)

{
@@ -376,80 +384,60 @@ static void sc6000_hw_cfg_encode(struct device *devptr, 
	dev_dbg(devptr, "hw cfg %x, %x\n", cfg[0], cfg[1]);

}



static int sc6000_init_board(struct device *devptr,

			     char __iomem *vport,

			     char __iomem *vmss_port, int dev)

static void sc6000_prepare_board(struct device *devptr,

				 struct snd_sc6000 *sc6000,

				 unsigned int dev, int xirq, int xdma)

{

	char answer[15];

	char version[2];

	int mss_config = sc6000_irq_to_softcfg(irq[dev]) |

			 sc6000_dma_to_softcfg(dma[dev]);

	int config = mss_config |

	sc6000->mss_config = sc6000_irq_to_softcfg(xirq) |

			     sc6000_dma_to_softcfg(xdma);

	sc6000->config = sc6000->mss_config |

			 sc6000_mpu_irq_to_softcfg(mpu_irq[dev]);

	int err;

	int old = 0;



	err = sc6000_dsp_reset(vport);

	if (err < 0) {

		dev_err(devptr, "sc6000_dsp_reset: failed!\n");

		return err;

	}



	memset(answer, 0, sizeof(answer));

	err = sc6000_dsp_get_answer(devptr, vport, GET_DSP_COPYRIGHT, answer, 15);

	if (err <= 0) {

		dev_err(devptr, "sc6000_dsp_copyright: failed!\n");

		return -ENODEV;

	sc6000_hw_cfg_encode(devptr, sc6000->hw_cfg, port[dev], mpu_port[dev],

			     mss_port[dev], joystick[dev]);

}

	/*

	 * My SC-6000 card return "SC-6000" in DSPCopyright, so

	 * if we have something different, we have to be warned.

	 */

	if (strncmp("SC-6000", answer, 7))

		dev_warn(devptr, "Warning: non SC-6000 audio card!\n");



	if (sc6000_dsp_get_answer(devptr, vport, GET_DSP_VERSION, version, 2) < 2) {

		dev_err(devptr, "sc6000_dsp_version: failed!\n");

		return -ENODEV;

static void sc6000_detect_old_dsp(struct device *devptr,

				  struct snd_sc6000 *sc6000)

{

	sc6000_write(devptr, sc6000->vport, COMMAND_5C);

	sc6000->old_dsp = sc6000_read(sc6000->vport) < 0;

}

	dev_info(devptr, "Detected model: %s, DSP version %d.%d\n",

		answer, version[0], version[1]);



	/* set configuration */

	sc6000_write(devptr, vport, COMMAND_5C);

	if (sc6000_read(vport) < 0)

		old = 1;

static int sc6000_program_board(struct device *devptr,

				struct snd_sc6000 *sc6000)

{

	int err;



	if (!old) {

		int cfg[2];

		sc6000_hw_cfg_encode(devptr,

				     vport, &cfg[0], port[dev], mpu_port[dev],

				     mss_port[dev], joystick[dev]);

		if (sc6000_hw_cfg_write(devptr, vport, cfg) < 0) {

	if (!sc6000->old_dsp) {

		if (sc6000_hw_cfg_write(devptr, sc6000->vport,

					sc6000->hw_cfg) < 0) {

			dev_err(devptr, "sc6000_hw_cfg_write: failed!\n");

			return -EIO;

		}

	}

	err = sc6000_setup_board(devptr, vport, config);



	err = sc6000_setup_board(devptr, sc6000->vport, sc6000->config);

	if (err < 0) {

		dev_err(devptr, "sc6000_setup_board: failed!\n");

		return -ENODEV;

	}



	sc6000_dsp_reset(vport);

	sc6000_dsp_reset(sc6000->vport);



	if (!old) {

		sc6000_write(devptr, vport, COMMAND_60);

		sc6000_write(devptr, vport, 0x02);

		sc6000_dsp_reset(vport);

	if (!sc6000->old_dsp) {

		sc6000_write(devptr, sc6000->vport, COMMAND_60);

		sc6000_write(devptr, sc6000->vport, 0x02);

		sc6000_dsp_reset(sc6000->vport);

	}



	err = sc6000_setup_board(devptr, vport, config);

	err = sc6000_setup_board(devptr, sc6000->vport, sc6000->config);

	if (err < 0) {

		dev_err(devptr, "sc6000_setup_board: failed!\n");

		return -ENODEV;

	}

	err = sc6000_init_mss(devptr, vport, config, vmss_port, mss_config);



	err = sc6000_init_mss(devptr, sc6000->vport, sc6000->config,

			      sc6000->vmss_port, sc6000->mss_config);

	if (err < 0) {

		dev_err(devptr, "Cannot initialize Microsoft Sound System mode.\n");

		return -ENODEV;
@@ -458,6 +446,45 @@ static int sc6000_init_board(struct device *devptr, 
	return 0;

}



static int sc6000_init_board(struct device *devptr, struct snd_sc6000 *sc6000)

{

	char answer[15];

	char version[2];

	int err;



	err = sc6000_dsp_reset(sc6000->vport);

	if (err < 0) {

		dev_err(devptr, "sc6000_dsp_reset: failed!\n");

		return err;

	}



	memset(answer, 0, sizeof(answer));

	err = sc6000_dsp_get_answer(devptr, sc6000->vport, GET_DSP_COPYRIGHT,

				    answer, 15);

	if (err <= 0) {

		dev_err(devptr, "sc6000_dsp_copyright: failed!\n");

		return -ENODEV;

	}

	/*

	 * My SC-6000 card return "SC-6000" in DSPCopyright, so

	 * if we have something different, we have to be warned.

	 */

	if (strncmp("SC-6000", answer, 7))

		dev_warn(devptr, "Warning: non SC-6000 audio card!\n");



	if (sc6000_dsp_get_answer(devptr, sc6000->vport,

				  GET_DSP_VERSION, version, 2) < 2) {

		dev_err(devptr, "sc6000_dsp_version: failed!\n");

		return -ENODEV;

	}

	dev_info(devptr, "Detected model: %s, DSP version %d.%d\n",

		answer, version[0], version[1]);



	sc6000_detect_old_dsp(devptr, sc6000);



	return sc6000_program_board(devptr, sc6000);

}



static int snd_sc6000_mixer(struct snd_wss *chip)

{

	struct snd_card *card = chip->card;
@@ -538,10 +565,10 @@ static int snd_sc6000_match(struct device *devptr, unsigned int dev) 


static void snd_sc6000_free(struct snd_card *card)

{

	char __iomem *vport = (char __force __iomem *)card->private_data;

	struct snd_sc6000 *sc6000 = card->private_data;



	if (vport)

		sc6000_setup_board(card->dev, vport, 0);

	if (sc6000->vport)

		sc6000_setup_board(card->dev, sc6000->vport, 0);

}



static int __snd_sc6000_probe(struct device *devptr, unsigned int dev)
@@ -552,15 +579,17 @@ static int __snd_sc6000_probe(struct device *devptr, unsigned int dev) 
	int xirq = irq[dev];

	int xdma = dma[dev];

	struct snd_card *card;

	struct snd_sc6000 *sc6000;

	struct snd_wss *chip;

	struct snd_opl3 *opl3;

	char __iomem *vport;

	char __iomem *vmss_port;



	err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE,

				0, &card);

				sizeof(*sc6000), &card);

	if (err < 0)

		return err;

	sc6000 = card->private_data;



	if (xirq == SNDRV_AUTO_IRQ) {

		xirq = snd_legacy_find_free_irq(possible_irqs);
@@ -587,7 +616,7 @@ static int __snd_sc6000_probe(struct device *devptr, unsigned int dev) 
		dev_err(devptr, "I/O port cannot be iomapped.\n");

		return -EBUSY;

	}

	card->private_data = (void __force *)vport;

	sc6000->vport = vport;



	/* to make it marked as used */

	if (!devm_request_region(devptr, mss_port[dev], 4, DRV_NAME)) {
@@ -600,12 +629,15 @@ static int __snd_sc6000_probe(struct device *devptr, unsigned int dev) 
		dev_err(devptr, "MSS port I/O cannot be iomapped.\n");

		return -EBUSY;

	}

	sc6000->vmss_port = vmss_port;



	dev_dbg(devptr, "Initializing BASE[0x%lx] IRQ[%d] DMA[%d] MIRQ[%d]\n",

		port[dev], xirq, xdma,

		mpu_irq[dev] == SNDRV_AUTO_IRQ ? 0 : mpu_irq[dev]);



	err = sc6000_init_board(devptr, vport, vmss_port, dev);

	sc6000_prepare_board(devptr, sc6000, dev, xirq, xdma);



	err = sc6000_init_board(devptr, sc6000);

	if (err < 0)

		return err;

	card->private_free = snd_sc6000_free;